first merge the generator comments from the gitorious branch 
3 files changed